got rid of somedaymaybe and waiting conditionals