it is not a separate class anymore