Yeah I think that should be done, this method is quite long ;)