done the fixes and added scenario