added some sates to the handler