closes #1 and #2 by MAGIC