small modificiations