Re-arranged some methods.