made some changes to make the code work with Aikuma currently