Tried to add further features