Updated to fix unwanted appearences