added all changes from old profileApp