Initial modifications on the fork