Use Marks And Functionality

#457