speed hack 75%

moe code integrated, event handler needs to be looked at