In Progress

another fixes for redhopit ONLY