Fixing Timer problems