Ready to push aidaros code