Changes made to constructor...