experimental
made fixes, updated values