major changes

code + img