FSS: cleaned code