Changed stuff to be compatible

--