Added current state, preview only, needs to be cleaned and decided what to keep