No longer have to double click on first time