fixes and a new modification model