Added optional skip