second cut, make better and more portable