working on timer and select
merge conflicts