V.1.4

Working better