adding to master properly timer impementd