Initial Version -Fixed