Fork and Fix for our needs