modified stuff in robin