updates
compilable.
ready for test.
but conversion delay can be still to update
Small update.