Dev 3.0

Changes for the dev version