prepare
final fix