added MissHandler and cleaned up