modifying stuff to get ready for AVC