fixed some of the issues from aropa