Loader Almost Fixed! Still pending iOS