fancy fix
final changes