Adding various changes