Modified init()