Added for convenience
More changes made