little changes to initialization