Added to first part of assignment