constructor fix - moved dev to own branch