Reverted changes - to be implemented at a later time