Updated Feature code