Done, seems to be working very well