RFOMSCALE introduced
merge conflict solved
minior changes for moive mode