last commit before weekend, still need to fix the ordering procedure