updated to work on Wakari