Began making changes to accomodate hardware changes