Removed numberBuffer "logic"