changed framework and fixed problems