Registration compatible with parse
fixing merges