added comments, better performance -> moving button