Re-arranged the methods.