Will take a look at that and try to implement it