Integrated previous commits