it works for now
final version?