changed to not deferred