cleaned up fork