made methods static
working tests