Sorted function order and new skeletons added ....