Cleaned up to section 50