modified stuff and made it good