modified controller specs
merged changes