dev last minute changes 2