Completed

another fixes for redhopit ONLY