Ok finally working as it should