logik changed and added (still instable)