progress on improve
stuff