Added button checking