FIX: add source commands back