Add some saves and few search