changed for view support