#8: updated for standalone build