isues #2 and #3