Work on // handling