added keeper support