f*cking timer..
merge