Slight modification in view of theme huraga