changes from Mathew class