Fixed transformations and add override to needed functions.