Small changes in concept
fixed merge