more tweaks and falcon ready version