made changes removing bulk code