More implementation done