Removed unnecessarily code & added new namecard