//some things changed with bugfixed