Bringing develop up to date