re-org for better float application