Hopefully fixed same methods