fixing with callbacks...