UPDATE #3

Added some more implementations