re-arranged some methods.