Get this to close quicker