fixed for nomen clature
merge changes