* review the code and make it less hackish