Removing useless entry
Adding the buffername to the function call
intermediary commit - need to test