Fixad Deferred
merge