Restored working build