Modified to work smoothly with lycaeus