added notice, not working anymore