Still doesn't work, various changes