finalized
fine tunings