ported lines into main project. changed styles