some modifications for Nobly