updated some part of the code with the new overlay actor; some tests doesnt pass yet,