Added 2 more implementations