Added initial values that were not being set correctly