major changes, just modified