DAR-3303 | Move and add comment