Finalized some changes