updated for neocsnipt