Fixed massive issue and removed fagads