Pull Request Dev_1.0

Done and used this to all cases as well :+1: