-moved parse in separate class