Merging functionality from previous commit