FIXED: added astroids, astroids factory