less hardcoding
added to whenever schedule