REVAMP THE SOURCE