Revamped samatha engine