Some final adjustments (almost there)