revised to a..d
revised to a..f
fixed conflict