[DEV] Added some code #2