all prev functionality moved to new version