some changes to make it work with Rally