Added #12 and #13