Raph stuff full merged