Yes it is, but I'm moving some code to make it more clear