Add check for caps

updated and tested! :)