removed d
merged changes from ben