update to be used as standalone