eliminated copypasted code