Ready for 2.7. Commented out add_to_log for now