This method needs to be rethought. @Zidane do you agree?