remove old elements checking and added new button checking