moved handler definition