Added some leftover code