Modifications to make app useful