DEV-102: updated