Replaced with better code convention