changed to separate buttons