Almost done. just need to make last changes