Closed #1 / Closed #2 and some ajustements