Initial fork and customizations