Improvments to Lotor