started adding changes as discussed on Monday meeting with Alexander Markowetz