Remove static from here