removed restable reference
simplified one of the helper functions a bit
readded former to the system