code simplification
synchronization with beta branch