RC.beta.4a

more refactoring