Moved and updated some code in mikelepage/